Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning up the woeful zexcon #1229

Merged
merged 39 commits into from
Dec 18, 2024

Conversation

lavillastrangiato
Copy link
Contributor

@lavillastrangiato lavillastrangiato commented Dec 4, 2024

About The Pull Request

Ports Ratwood's sexcon, without the zape, fetish content, a few extraneous eyebrow-raising stuff, and makes wording less explicit. Edit 18/12/2024: Adds the GENITAL-MINCING CODE, by https://github.com/Darkrp-community/OpenKeep/pull/1254/files, to this PR to cut down on the merge conflicts.

  • I fixed the pink screen overlays!
  • Some same-sex acts have been added.
  • There are speeds (which technically already existed) and forces now. Highly immersive. (I have removed the "brutal" and "unrelenting" speeds and forces because that's just too much)
  • Religious roles have had their virginity stress events rejigged a bit to be lore-accurate. If you are a religious role, the virginity-loss stress event will only proc if your patron is Astrata, Noc, Malum, or the Forgotten God, and you are not married.
  • Adminlogs now exist for: trying to initiate sex with an unconscious person, trying to initiate sex with a dead person (or a disconnected person), and trying to initiate sex with someone in combat mode. In all cases, you can't open the menu and a notification will pop up in chat as to why you can't do it.
    image

Why It's Good For The Game

  • The original sexcon is poorly coded. It is barely documented, unnecessarily long and yet oddly barebones while also lacking atomisation. It is very difficult to remove stuff like the zapecode or even shorten an if-statement without causing problems.
  • This sexcon is better-atomised and better-documented. It is also easier on the eyes as a piece of code.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@bowlofcereal
Copy link
Contributor

ssstwitter.com_1706574900990.mov

@lavillastrangiato lavillastrangiato changed the title May I be forgiven for my sins (testing linters) Cleaning up the woeful zexcon Dec 5, 2024
@lavillastrangiato lavillastrangiato marked this pull request as draft December 5, 2024 01:08
@messagecypher
Copy link

thanks lvs

@lavillastrangiato lavillastrangiato marked this pull request as ready for review December 6, 2024 03:42
@NPC1314 NPC1314 added the Scheduled for testmerge This PR should be testmerged label Dec 6, 2024
@NPC1314
Copy link
Contributor

NPC1314 commented Dec 8, 2024

Not a fan of menus popping up, but then again I'm not going to try to do any work with this system and I'm not testing it either so unless anyone got better ideas I guess we go with this, since the old was broken by #1145 I'm told.

@ThePainkiller
Copy link
Contributor

Wondering if there's any kinks (pun intended) left to iron on this PR or if it's finally time to give this a full merge?

@NPC1314 NPC1314 linked an issue Dec 17, 2024 that may be closed by this pull request
1 task
@NPC1314 NPC1314 merged commit 112fe72 into Darkrp-community:main Dec 18, 2024
7 checks passed
@NPC1314 NPC1314 removed the Scheduled for testmerge This PR should be testmerged label Dec 18, 2024
@lavillastrangiato lavillastrangiato deleted the ohchristohfuck branch December 19, 2024 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Most Sexo Functions Broken
6 participants